svn merge ^/trunk/blender -r43420:43436
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 02:20:23 +0000 (02:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 02:20:23 +0000 (02:20 +0000)
15 files changed:
1  2 
CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/modifiers/intern/MOD_boolean.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c

diff --cc CMakeLists.txt
Simple merge
@@@ -1750,6 -1783,9 +1777,9 @@@ static struct DerivedMesh *dynamicPaint
                                }
                        }
                }
 -                      CDDM_calc_normals(result);
+               if (update_normals)
++                      CDDM_calc_normals_mapping(result);
        }
        /* make a copy of dm to use as brush data */
        if (pmd->brush) {
@@@ -212,24 -199,27 +212,24 @@@ void ED_operatormacros_mesh(void
  
        ot= WM_operatortype_append_macro("MESH_OT_extrude_region_move", "Extrude Region and Move", OPTYPE_UNDO|OPTYPE_REGISTER);
        ot->description = "Extrude region and move result";
 -      otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude");
 -      RNA_enum_set(otmacro->ptr, "type", 1);
 +      otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude_region");
        otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
        RNA_enum_set(otmacro->ptr, "proportional", 0);
-       RNA_boolean_set(otmacro->ptr, "mirror", 0);
+       RNA_boolean_set(otmacro->ptr, "mirror", FALSE);
  
        ot= WM_operatortype_append_macro("MESH_OT_extrude_faces_move", "Extrude Individual Faces and Move", OPTYPE_UNDO|OPTYPE_REGISTER);
        ot->description = "Extrude faces and move result";
 -      otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude");
 -      RNA_enum_set(otmacro->ptr, "type", 2);
 +      otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude_faces_indiv");
        otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_shrink_fatten");
        RNA_enum_set(otmacro->ptr, "proportional", 0);
-       RNA_boolean_set(otmacro->ptr, "mirror", 0);
+       RNA_boolean_set(otmacro->ptr, "mirror", FALSE);
  
        ot= WM_operatortype_append_macro("MESH_OT_extrude_edges_move", "Extrude Only Edges and Move", OPTYPE_UNDO|OPTYPE_REGISTER);
        ot->description = "Extrude edges and move result";
 -      otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude");
 -      RNA_enum_set(otmacro->ptr, "type", 3);
 +      otmacro= WM_operatortype_macro_define(ot, "MESH_OT_extrude_edges_indiv");
        otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
        RNA_enum_set(otmacro->ptr, "proportional", 0);
-       RNA_boolean_set(otmacro->ptr, "mirror", 0);
+       RNA_boolean_set(otmacro->ptr, "mirror", FALSE);
  
        ot= WM_operatortype_append_macro("MESH_OT_extrude_vertices_move", "Extrude Only Vertices and Move", OPTYPE_UNDO|OPTYPE_REGISTER);
        ot->description = "Extrude vertices and move result";
Simple merge
Simple merge
Simple merge