Revision: 43686
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43686
Author: campbellbarton
Date: 2012-01-24 22:44:48 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43676:43685
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43676
Modified Paths:
--------------
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43676
+
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43685
Modified: branches/bmesh/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2012-01-24
22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/intern/cycles/blender/addon/ui.py 2012-01-24
22:44:48 UTC (rev 43686)
@@ -241,7 +241,7 @@
class Cycles_PT_context_material(CyclesButtonsPanel, Panel):
- bl_label = "Surface"
+ bl_label = ""
bl_context = "material"
bl_options = {'HIDE_HEADER'}
Property changes on:
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_brightness.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
branches/bmesh/blender/intern/cycles/kernel/svm/svm_brightness.h
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664
+
/trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43554,43565-43611,43617-43664,43677-43685
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
2012-01-24 22:44:48 UTC (rev 43686)
@@ -61,6 +61,8 @@
if snode.shader_type == 'WORLD':
layout.template_ID(scene, "world", new="world.new")
+ if snode_id:
+ layout.prop(snode_id, "use_nodes")
elif snode.tree_type == 'TEXTURE':
layout.prop(snode, "texture_type", text="", expand=True)
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2012-01-24 22:44:48 UTC (rev 43686)
@@ -2224,7 +2224,7 @@
* and calling the fill function */
#define USE_TESSFACE_SPEEDUP
-// #define USE_TESSFACE_QUADS // NEEDS FURTHER TESTING
+#define USE_TESSFACE_QUADS // NEEDS FURTHER TESTING
#define TESSFACE_SCANFILL (1<<0)
#define TESSFACE_IS_QUAD (1<<1)
Modified:
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
2012-01-24 22:44:48 UTC (rev 43686)
@@ -1127,6 +1127,9 @@
fprintf(stderr,"Particle distribution error: Nothing to
emit from!\n");
if(dm != finaldm) dm->release(dm);
+
+ BLI_kdtree_free(tree);
+
return 0;
}
Modified: branches/bmesh/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_node/space_node.c
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/source/blender/editors/space_node/space_node.c
2012-01-24 22:44:48 UTC (rev 43686)
@@ -169,6 +169,7 @@
/* note, ED_area_tag_refresh will re-execute compositor */
SpaceNode *snode= sa->spacedata.first;
int type= snode->treetype;
+ short shader_type = snode->shaderfrom;
/* preview renders */
switch(wmn->category) {
@@ -214,6 +215,11 @@
ED_area_tag_refresh(sa);
}
break;
+ case NC_WORLD:
+ if(type==NTREE_SHADER &&
shader_type==SNODE_SHADER_WORLD) {
+ ED_area_tag_refresh(sa);
+ }
+ break;
case NC_OBJECT:
if(type==NTREE_SHADER) {
if(wmn->data==ND_OB_SHADING)
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
2012-01-24 22:44:48 UTC (rev 43686)
@@ -4746,7 +4746,7 @@
case PROP_STRING: {
const char *defvalue=
((StringPropertyRNA*)parm)->defaultvalue;
if(defvalue && defvalue[0])
- memcpy(data, &defvalue, size);
+ BLI_strncpy(data, defvalue,
size);
break;
}
case PROP_POINTER:
Modified: branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
===================================================================
--- branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
2012-01-24 22:44:48 UTC (rev 43686)
@@ -643,7 +643,7 @@
parm= RNA_def_enum(func, "type", mesh_dm_info_items, 0, "", "Modifier
settings to apply");
RNA_def_property_flag(parm, PROP_REQUIRED);
/* weak!, no way to return dynamic string type */
- parm= RNA_def_string(func, "result", "result", 16384, "result", "");
+ parm= RNA_def_string(func, "result", "", 16384, "result", "");
RNA_def_property_flag(parm, PROP_THICK_WRAP); /* needed for string
return value */
RNA_def_function_output(func, parm);
#endif /* NDEBUG */
Property changes on:
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_brightness.c
___________________________________________________________________
Added: svn:eol-style
+ native
Modified:
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
2012-01-24 22:15:25 UTC (rev 43685)
+++ branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
2012-01-24 22:44:48 UTC (rev 43686)
@@ -2166,7 +2166,7 @@
ot->exec= wm_collada_export_exec;
ot->poll= WM_operator_winactive;
- WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE,
FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH);
+ WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE,
FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
RNA_def_boolean(ot->srna, "selected", 0, "Export only selected",
"Export only selected elements");
}
@@ -2198,7 +2198,7 @@
ot->exec= wm_collada_import_exec;
ot->poll= WM_operator_winactive;
- WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE,
FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
+ WM_operator_properties_filesel(ot, FOLDERFILE|COLLADAFILE,
FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
}
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
