[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29270] branches/soc-2010-rohith291991/ source/blender: merged revisions 29266-29269.

[Rohith B V]

Revision: 29270
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29270
Author:   rohith291991
Date:     2010-06-06 11:40:25 +0200 (Sun, 06 Jun 2010)

Log Message:
-----------
merged revisions 29266-29269.

Modified Paths:
--------------
    branches/soc-2010-rohith291991/source/blender/editors/render/CMakeLists.txt
    branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-rohith291991/source/blender/windowmanager/intern/wm_event_system.c

Modified: branches/soc-2010-rohith291991/source/blender/editors/render/CMakeLists.txt
===================================================================
--- branches/soc-2010-rohith291991/source/blender/editors/render/CMakeLists.txt	2010-06-06 09:20:27 UTC (rev 29269)
+++ branches/soc-2010-rohith291991/source/blender/editors/render/CMakeLists.txt	2010-06-06 09:40:25 UTC (rev 29270)
@@ -30,6 +30,7 @@
 	../../imbuf
 	../include
 	../../../../intern/guardedalloc
+	../../../../extern/glew/include
 	../../makesdna
 	../../makesrna
 	../../python

Modified: branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_modifier.c	2010-06-06 09:20:27 UTC (rev 29269)
+++ branches/soc-2010-rohith291991/source/blender/makesrna/intern/rna_modifier.c	2010-06-06 09:40:25 UTC (rev 29270)
@@ -1575,11 +1575,17 @@
 static void rna_def_modifier_particlesystem(BlenderRNA *brna)
 {
 	StructRNA *srna;
+	PropertyRNA *prop;
 
 	srna= RNA_def_struct(brna, "ParticleSystemModifier", "Modifier");
 	RNA_def_struct_ui_text(srna, "ParticleSystem Modifier", "Particle system simulation modifier");
 	RNA_def_struct_sdna(srna, "ParticleSystemModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_MOD_PARTICLES);
+	
+	prop= RNA_def_property(srna, "particle_system", PROP_POINTER, PROP_NONE);
+	RNA_def_property_flag(prop, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "psys");
+	RNA_def_property_ui_text(prop, "Particle System", "Particle System that this modifier controls");
 }
 
 static void rna_def_modifier_particleinstance(BlenderRNA *brna)

Modified: branches/soc-2010-rohith291991/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- branches/soc-2010-rohith291991/source/blender/windowmanager/intern/wm_event_system.c	2010-06-06 09:20:27 UTC (rev 29269)
+++ branches/soc-2010-rohith291991/source/blender/windowmanager/intern/wm_event_system.c	2010-06-06 09:40:25 UTC (rev 29270)
@@ -392,11 +392,13 @@
 	if(retval & OPERATOR_FINISHED) {
 		if(G.f & G_DEBUG)
 			wm_operator_print(op); /* todo - this print may double up, might want to check more flags then the FINISHED */
-			
-		/* Report the python string representation of the operator */
-		buf = WM_operator_pystring(C, op->type, op->ptr, 1);
-		BKE_report(CTX_wm_reports(C), RPT_OPERATOR, buf);
-		MEM_freeN(buf);
+		
+		if (op->type->flag & OPTYPE_REGISTER) {
+			/* Report the python string representation of the operator */
+			buf = WM_operator_pystring(C, op->type, op->ptr, 1);
+			BKE_report(CTX_wm_reports(C), RPT_OPERATOR, buf);
+			MEM_freeN(buf);
+		}
 	}
 
 	if (op->reports->list.first) {