Commit: 67a161d7031ac62cd9d96494d7d5eb4667edad9a
Author: Julian Eisel
Date: Thu Oct 6 23:29:53 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rB67a161d7031ac62cd9d96494d7d5eb4667edad9a
Merge branch 'temp_manipulators_core' into custom-manipulators
Conflicts:
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_view3d_types.h
===================================================================
===================================================================
diff --cc source/blender/makesdna/intern/makesdna.c
index c1a9b7a,2cea871..0f7ed8c
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@@ -1328,8 -1329,9 +1327,7 @@@ int main(int argc, char **argv
#include "DNA_cloth_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_windowmanager_types.h"
- #include "DNA_manipulator_types.h"
#include "DNA_anim_types.h"
-#include "DNA_boid_types.h"
#include "DNA_smoke_types.h"
#include "DNA_speaker_types.h"
#include "DNA_movieclip_types.h"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
