[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61154] trunk/blender/source: code cleanup : typo and warning when openmp's disabled.
Campbell Barton
ideasman42 at gmail.com
Tue Nov 5 22:59:30 CET 2013
Revision: 61154
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61154
Author: campbellbarton
Date: 2013-11-05 21:59:30 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
code cleanup: typo and warning when openmp's disabled.
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/armature_edit.c
trunk/blender/source/blender/editors/include/ED_armature.h
trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
Modified: trunk/blender/source/blender/editors/armature/armature_edit.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_edit.c 2013-11-05 21:47:59 UTC (rev 61153)
+++ trunk/blender/source/blender/editors/armature/armature_edit.c 2013-11-05 21:59:30 UTC (rev 61154)
@@ -484,7 +484,7 @@
/* the number of joints determines how we fill:
* 1) between joint and cursor (joint=head, cursor=tail)
- * 2) between the two joints (order is dependent on active-bone/hierachy)
+ * 2) between the two joints (order is dependent on active-bone/hierarchy)
* 3+) error (a smarter method involving finding chains needs to be worked out
*/
count = BLI_countlist(&points);
Modified: trunk/blender/source/blender/editors/include/ED_armature.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_armature.h 2013-11-05 21:47:59 UTC (rev 61153)
+++ trunk/blender/source/blender/editors/include/ED_armature.h 2013-11-05 21:59:30 UTC (rev 61154)
@@ -106,7 +106,7 @@
(((ebone)->flag & BONE_SELECTED) && !((ebone)->flag & BONE_EDITMODE_LOCKED)) \
)
-/* used in bone_select_hierachy() */
+/* used in armature_select_hierarchy_exec() */
#define BONE_SELECT_PARENT 0
#define BONE_SELECT_CHILD 1
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-11-05 21:47:59 UTC (rev 61153)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-11-05 21:59:30 UTC (rev 61154)
@@ -277,8 +277,9 @@
Object *ob;
ViewContext vc;
LassoMaskData data;
+#ifdef _OPENMP
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-
+#endif
struct MultiresModifierData *mmd;
DerivedMesh *dm;
PBVH *pbvh;
@@ -322,7 +323,7 @@
sculpt_undo_push_begin("Mask lasso fill");
- #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
+#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
for (i = 0; i < totnode; i++) {
PBVHVertexIter vi;
Modified: trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-11-05 21:47:59 UTC (rev 61153)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_draw.c 2013-11-05 21:59:30 UTC (rev 61154)
@@ -1624,7 +1624,7 @@
/* set matrix for 2d-view controls */
UI_view2d_view_ortho(v2d);
- /* draw outliner stuff (background, hierachy lines and names) */
+ /* draw outliner stuff (background, hierarchy lines and names) */
outliner_back(ar);
block = uiBeginBlock(C, ar, __func__, UI_EMBOSS);
outliner_draw_tree((bContext *)C, block, scene, ar, soops, &te_edit);
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-11-05 21:47:59 UTC (rev 61153)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-11-05 21:59:30 UTC (rev 61154)
@@ -630,7 +630,7 @@
newsensorobj = (SCA_IObject*)(*h_obj);
if (!newsensorobj)
{
- // no, then the sensor points outside the hierachy, keep it the same
+ // no, then the sensor points outside the hierarchy, keep it the same
if (m_objectlist->SearchValue(oldsensorobj))
// only replicate links that points to active objects
m_logicmgr->RegisterToSensor(cont,oldsensor);
@@ -670,7 +670,7 @@
if (!newactuatorobj)
{
- // no, then the sensor points outside the hierachy, keep it the same
+ // no, then the sensor points outside the hierarchy, keep it the same
if (m_objectlist->SearchValue(oldactuatorobj))
// only replicate links that points to active objects
m_logicmgr->RegisterToActuator(cont,oldactuator);
More information about the Bf-blender-cvs
mailing list