[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41505] trunk/blender/source/blender: compile without python works again
Campbell Barton
ideasman42 at gmail.com
Fri Nov 4 00:20:57 CET 2011
Revision: 41505
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41505
Author: campbellbarton
Date: 2011-11-03 23:20:54 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
compile without python works again
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2011-11-03 22:58:05 UTC (rev 41504)
+++ trunk/blender/source/blender/editors/interface/interface.c 2011-11-03 23:20:54 UTC (rev 41505)
@@ -2569,10 +2569,12 @@
if(block->curlayout)
ui_layout_add_but(block->curlayout, but);
+#ifdef WITH_PYTHON
/* if the 'UI_OT_editsource' is running, extract the source info from the button */
if (UI_editsource_enable_check()) {
UI_editsource_active_but_test(but);
}
+#endif
return but;
}
Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c 2011-11-03 22:58:05 UTC (rev 41504)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c 2011-11-03 23:20:54 UTC (rev 41505)
@@ -476,6 +476,7 @@
ot->exec= reports_to_text_exec;
}
+#ifdef WITH_PYTHON
/* ------------------------------------------------------------------------- */
/* EditSource Utility funcs and operator,
@@ -711,6 +712,7 @@
ot->exec= editsource_exec;
}
+#endif /* WITH_PYTHON */
/* ********************************************************* */
/* Registration */
@@ -723,6 +725,9 @@
WM_operatortype_append(UI_OT_reset_default_button);
WM_operatortype_append(UI_OT_copy_to_selected_button);
WM_operatortype_append(UI_OT_reports_to_textblock); // XXX: temp?
+
+#ifdef WITH_PYTHON
WM_operatortype_append(UI_OT_editsource);
+#endif
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2011-11-03 22:58:05 UTC (rev 41504)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2011-11-03 23:20:54 UTC (rev 41505)
@@ -268,9 +268,6 @@
static void rna_Curve_dimension_set(PointerRNA *ptr, int value)
{
Curve *cu= (Curve*)ptr->id.data;
- ListBase *nurbs= BKE_curve_nurbs(cu);
- Nurb *nu= nurbs->first;
-
if(value==CU_3D) cu->flag |= CU_3D;
else cu->flag &= ~CU_3D;
More information about the Bf-blender-cvs
mailing list