Notes |
|
(0028922)
|
Utkarsh Ayachit
|
2012-07-25 11:05
|
|
commit 2eb14db9925bd19165412e8763682380e6d4863d
Merge: 3ac4dec 1cf5f41
Author: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Date: Wed Jul 25 11:04:11 2012 -0400
Merge remote branch 'stage/6129_translucent_polygonal_rendering' into fix_xml_indentation
* stage/6129_translucent_polygonal_rendering:
Fix issues with the color scale editor and opacity functions
Add support for surface scalar opacity rendering
Fix compilation error in pqPQLookupTableManager
Laying ground work for BUG 0006129.
Conflicts:
ParaViewCore/ServerImplementation/Resources/utilities.xml
commit 3ac4dec261a882eb559b68b8ae383cf9e11a196b
Author: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Date: Wed Jul 25 10:58:23 2012 -0400
Fixing indentation in ServerManager xml files.
Indentation in XML files was broken. People had pushed "\t" which was making the
xml unreadable. Auto-correcting indentation using the following command:
tidy --literal-attributes yes --preserve-entities yes -o <output xml> -wrap 80
-i -xml --drop-empty-paras no --indent-attributes yes --vertical-space yes
--wrap-attributes yes --sort-attributes alpha <input xml> |
|
|
(0028960)
|
Utkarsh Ayachit
|
2012-07-27 14:43
|
|
merged into master, if applicable. |
|
|
(0028967)
|
Alan Scott
|
2012-08-01 14:16
|
|
Developer tag in the bug tracker. Closing. |
|