a37c41e3f5
Update to build on Xcode 6.0: removal of some unused variables
2014-10-19 17:30:46 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
65f0972a64
NORSPEC-262 make drag and drop aware of editing context so that editing normal/spec textures causes application to the correct tex channel
2013-06-20 12:41:46 -07:00
f04e9363b9
NORSPEC-266 fix issues with observer feedback on edits of material map parameters
2013-06-14 09:41:33 -07:00
98d2a434db
NORSPEC-263 replaced dropped deg to rad conversion between UI and material update
2013-06-13 08:23:40 -07:00
8ad2c0b8fb
NORSPEC-260 fix issues with OK after pressing none being intepreted as add a null normal map
2013-06-12 15:01:23 -07:00
96f7f6d01b
NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI correctly and fix issues with transition from no-bumps to normal maps
2013-06-11 17:18:20 -07:00
7fcbb7c177
Fix build failure from warning and dav3p no-JIRA bug about normal map scale editing
2013-06-11 13:54:03 -07:00
87946113cc
NORSPEC-257 can't use automated TEMaterialGet functor as we need two possible defaults for diffuse alpha mode based on the alpha content of the diffuse texture
2013-06-11 12:48:59 -07:00
5c1144c48b
NORSPEC-222 fix issues with removing the use texture item selecting weave when the TE was BUMPY_TEXTURE, but no normal map was applied
2013-06-10 19:06:19 -07:00
e666725f9d
NORSPEC-257 fix alpha mode display incorrect default when alpha is present in tex
2013-06-10 18:49:50 -07:00
9d73f625ab
NORSPEC-252 fix reverting normal maps to none
2013-06-10 15:17:45 -07:00
4cd133fe00
NORSPEC-248 fix broken repeats handling in media mode
2013-06-10 09:13:59 -07:00
bc2a6adb5a
NORSPEC-87 fix diffuse repeats display as well
2013-06-10 08:10:59 -07:00
8ff9786c81
NORSPEC-87 fix regression from NSPEC 233 fix typo which is breaking norm repeats display
2013-06-10 07:52:39 -07:00
045634f89e
NORSPEC-233 fix regressions in default spec parameters
2013-06-08 07:43:26 -07:00
fba40dc4f7
NORSPEC-226 NORSPEC-222 fix menu content bugs and alpha mask stomp when editing multiple objects
2013-06-08 07:25:47 -07:00
c78cd1aae6
NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and make scale accessors get with the program
2013-06-07 14:37:39 -07:00
af0cc77199
NORSPEC-233 WIP cleanup and fix crasher in templated material get driver func
2013-06-07 14:17:13 -07:00
b15cdc828e
Fix busted WIP check-in
2013-06-07 13:10:36 -07:00
c60eac25e5
Merge MAINT-2740 crash fix
2013-06-07 12:50:02 -07:00
3541b4c613
NORSPEC-233 WIP clean up regressions in enable/tentative logic from rework
2013-06-07 10:41:08 -07:00
7e4e59470f
NORSPEC-233 WIP for individual material param edits across hetero object selections
2013-06-07 08:58:15 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
d40acfb05a
NORSPEC-237 nix resetting the keyboard focus to cripple the repeats per meter control
2013-06-05 14:18:29 -07:00
da6a4ac62e
Revert NORSPEC-214 fix causing knock-on in spec exp controls
2013-05-31 15:55:56 -07:00
12307cd473
NORSPEC-214 fix dropdown handling of 'Use Texture' item across objects
2013-05-30 18:01:14 -07:00
287b631d9a
NORSPEC-211 less intrusive version of this fix
2013-05-28 15:57:01 -07:00
50158987fa
NORSPEC-211 better handling of diff alpha mode
2013-05-28 12:28:47 -07:00
260afbcece
NORSPEC-192 fix more incorrect batching, fix bug in reflecting normal map state in build tool, and protect against callback crashes when switching regions
2013-05-23 16:24:34 -07:00
9ef98bece2
NORSPEC-193 NORSPEC-161 make legacy shiny a batch breaker when materials are in play
2013-05-23 10:42:32 -07:00
5c6da1c8ee
NORSPEC-204 make tex controls act like diffuse map when in media mode
2013-05-22 15:23:10 -07:00
69ad1f6236
NORSPEC-205 more dueling spec controls
2013-05-22 09:54:11 -07:00
06b3879acc
NORSPEC-200 fix regression from 188 fix caused by not having enough bits to store SHINY_TEXTURE in the TEs bitfield
2013-05-21 15:27:52 -07:00
eaff189b45
Merge
2013-05-20 16:38:10 -07:00
a1a8048d3e
NORSPEC-188 avoid removing 'Use Texture' item when cancelling from picker back to having prev texture
2013-05-20 16:24:58 -07:00
5acb0b3a32
NORSPEC-168 fix UI update to not re-add the 'Use Texture' item when selecting legacy bump settings
2013-05-20 11:56:48 -07:00
68c6ad909c
Merge
2013-05-16 12:06:29 -07:00
f58b17cb29
NORSPEC-152 better default norm/spec textures which read better in the UI and provide better default spec feedback
2013-05-15 15:03:39 -07:00
da6022e9b4
NORSPEC-175 Force "alpha mode" to blend in UI when transparency is above zero
2013-05-15 15:30:00 -05:00
a37bff8bf1
NORSPEC-103 reflect normal/spec UVs in face edit overlay display
2013-05-14 15:26:43 -07:00
8b6be5c667
NORSPEC-85 fix default normal vert offset
2013-05-14 08:25:42 -07:00
c334a185f3
NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
2013-05-14 05:59:48 -07:00
d9e8ee7cfd
NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter
2013-05-13 13:02:53 -07:00
c486d9498b
Refactor LLPanelFace to make it clearer that the material is a property of the face(s) and never the panel
2013-05-12 12:58:46 +02:00
e1c1428569
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
2013-05-11 20:38:23 -07:00
f356d7eb9f
Fix many issues with selection misapplication and rendering not matching applied materials
2013-05-11 19:58:56 -07:00
callum_linden